Skip to content

Fix limited statistic collection accross files with no stats - #4521

Merged
alamb merged 1 commit into
apache:masterfrom
isidentical:gh-4323
Dec 17, 2022
Merged

alamb merged 1 commit into
apache:masterfrom
isidentical:gh-4323

Conversation

@isidentical

Copy link
Copy Markdown
Contributor

Which issue does this PR close?

Closes #4323.

Rationale for this change

Even in the cases where none of the files included stats/byte size information, get_statistics_with_limit was generating statistics with the claims of zero rows / zero bytes. This PR fixes it to only include the number of rows when it is known.

What changes are included in this PR?

For preserving the old relaxed behavior, this PR changes the collection to include row/byte count information when any of them are present in any of the files. If it is only present in even one file, that is enough for the listing (all the others are counted towards zero rows, which is the existing behavior).

Are these changes tested?

Yes.

Are there any user-facing changes?

No.

@github-actions github-actions Bot added the core Core DataFusion crate label Dec 5, 2022
@isidentical
isidentical marked this pull request as ready for review December 14, 2022 20:30

@alamb alamb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM -- thank you @isidentical

let table = ListingTable::try_new(config)?;

let exec = table.scan(&state, None, &[], None).await?;
assert_eq!(exec.statistics().num_rows, None);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +76 to +85
num_rows = if let Some(num_rows) = num_rows {
Some(num_rows + file_stats.num_rows.unwrap_or(0))
} else {
file_stats.num_rows
};
total_byte_size = if let Some(total_byte_size) = total_byte_size {
Some(total_byte_size + file_stats.total_byte_size.unwrap_or(0))
} else {
file_stats.total_byte_size
};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are into a more functional style of coding, you can do something like the following as well

Suggested change
num_rows = if let Some(num_rows) = num_rows {
Some(num_rows + file_stats.num_rows.unwrap_or(0))
} else {
file_stats.num_rows
};
total_byte_size = if let Some(total_byte_size) = total_byte_size {
Some(total_byte_size + file_stats.total_byte_size.unwrap_or(0))
} else {
file_stats.total_byte_size
};
num_rows = num_rows
.map(|num_rows| num_rows + file_stats.num_rows.unwrap_or(0))
.or(file_stats.num_rows);
total_byte_size = total_byte_size
.map(|total_byte_size| total_byte_size + file_stats.total_byte_size.unwrap_or(0))
.or(file_stats.total_byte_size);

@alamb

alamb commented Dec 15, 2022

Copy link
Copy Markdown
Contributor

cc @mingmwang

@alamb
alamb merged commit 067d044 into apache:master Dec 17, 2022
@ursabot

ursabot commented Dec 17, 2022

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 8d36529 and contender = 067d044. 067d044 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core Core DataFusion crate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Revisit get_statistics_with_limit() method in datasource mod

3 participants